")
- {
- temp += "\n"; //new row -> new line
- i = stitchText(html, temp, i+4);
- if(i == -1) //EOF
- break;
- }
- else if(tableTag == "| " || tableTag == " | ")
- {
- temp += "\t"; // new cell -> tab between data
- i = stitchText(html, temp, i+4);
- if (i == -1) //EOF
- break;
- }
- else if(tableTag == " | text = temp;
-}
-
-int Page::stitchText(std::string& from, std::string& to, int index)
-{
- if (from[index] == '<')
- {
- std::string bTag = from.substr(index, 3);
- if (bTag != "")
- return index-1; //go back one step - for the main function to inc i
- index += 3;
- }
-
- while (from[index] != '<' && index < (int)from.length())
- {
- if (from[index] == '&')
- {
- //
- std::string nbspChr = from.substr(index, 6);
- if (nbspChr == " ")
- {
- index += 5;
- from.at(index) = ' ';
- }
-
- }
-
- if (endOfString(index,(int) from.length()))
- return -1; //EOF
-
- else if (from[index] == '<')
- return index - 1; //go back one step - for the main function to inc i
-
- if (from[index] != '\n') //check the actuall data before continue
- to += from[index];
- index++;
- }
-
- return index-1;
-}
-bool Page::endOfString(int index, int length)
-{
- if(index < length)
- return false;
- return true;
-}
-
-std::string Page::getString()
-{
- return this->text;
-}
-
-std::string Page::getTitle()
-{
- return this->title;
-}
+#include "Page.h"
+
+Page::Page(std::string& html)
+{
+ makeText(html);
+}
+void Page::makeText(std::string& html)
+{
+ int index = 0;
+ index = findTitle(html, index);
+ index = runToActualText(html, index); //set index into the actual place where the data is
+ manageTableContent(html, index);
+}
+
+int Page::findTitle(std::string& from, int index)
+{
+ std::string temp;
+ while(index < (int)from.length())
+ {
+ if(from[index] == '<')
+ {
+ //title>
+ index++;
+ std::string titleTag = from.substr(index, 5); //legth of title
+ if(titleTag == "title") //check if the tag is title
+ {
+ while(from[index] != '>')
+ index++;
+ index++;
+ while(from[index] != '<')
+ {
+ temp += from[index];
+ index++;
+ }
+ this->title = temp; //sets the title
+ return index;
+ }
+ }
+
+ index++;
+ }
+ return -1;
+}
+
+int Page::runToActualText(std::string& from, int index)
+{
+ while(index < (int)from.length())
+ {
+ if(from[index] == '<')
+ {
+ index++;
+ if(from[index] == '!')
+ {
+ //!--FileName
+ std::string bodyTag = from.substr(index, 11); //!--FileName
+
+ if(bodyTag == "!--FileName") //check if the tag is body tag
+ {
+ while(from[index] != '>')
+ index++;
+ return index;
+ }
+ }
+ }
+ index++;
+ }
+ return -1;
+}
+
+void Page::manageTableContent(std::string& html, int index)
+{
+ std::string temp;
+ for (int i = index; i < (int)html.length(); i++)
+ {
+ if(html[i] == '<')
+ {
+ // / | / |
+ std::string endofTable = "";
+ std::string tableTag = html.substr(i, 4); //legth of "tr/td"
+ if(tableTag == " | ")
+ {
+ temp += "\n"; //new row -> new line
+ i = stitchText(html, temp, i+4);
+ if(i == -1) //EOF
+ break;
+ }
+ else if(tableTag == "| " || tableTag == " | ")
+ {
+ temp += "\t"; // new cell -> tab between data
+ i = stitchText(html, temp, i+4);
+ if (i == -1) //EOF
+ break;
+ }
+ else if(tableTag == " | text = temp;
+}
+
+int Page::stitchText(std::string& from, std::string& to, int index)
+{
+ if (from[index] == '<')
+ {
+ std::string bTag = from.substr(index, 3);
+ if (bTag != "")
+ return index-1; //go back one step - for the main function to inc i
+ index += 3;
+ }
+
+ while (from[index] != '<' && index < (int)from.length())
+ {
+ if (from[index] == '&')
+ {
+ //
+ std::string nbspChr = from.substr(index, 6);
+ if (nbspChr == " ")
+ {
+ index += 5;
+ from.at(index) = ' ';
+ }
+
+ }
+
+ if (endOfString(index,(int) from.length()))
+ return -1; //EOF
+
+ else if (from[index] == '<')
+ return index - 1; //go back one step - for the main function to inc i
+
+ if (from[index] != '\n') //check the actuall data before continue
+ to += from[index];
+ index++;
+ }
+
+ return index-1;
+}
+bool Page::endOfString(int index, int length)
+{
+ if(index < length)
+ return false;
+ return true;
+}
+
+std::string Page::getString()
+{
+ return this->text;
+}
+
+std::string Page::getTitle()
+{
+ return this->title;
+}
diff --git a/src/grades/Page.h b/src/grades/Page.h
index 5796487..da6cf2d 100644
--- a/src/grades/Page.h
+++ b/src/grades/Page.h
@@ -1,42 +1,42 @@
-#ifndef PAGE_H
-#define PAGE_H
-
-/* This Code Made By Sagi Dayan
- * SagiDayan@gmail.com
- *
- * Minor changes has been made by Liran Ben Gida
- * LiranBG@gmail.com
-*/
-
-#include
-#include
-
-class Page
-{
-
-public:
-
- ~Page() {}
-
-protected:
- Page(std::string& html);
- std::string getString();
- std::string getTitle();
- void makeText(std::string& html);
-
-
-private:
-
-
- int findTitle(std::string& from, int index);
- int runToActualText(std::string& from, int index);
- void manageTableContent(std::string& html, int index);
- int stitchText(std::string& from, std::string& to, int index);
- bool endOfString(int index, int length);
-
- std::string text;
- std::string title;
-
-};
-
-#endif
+#ifndef PAGE_H
+#define PAGE_H
+
+/* This Code Made By Sagi Dayan
+ * SagiDayan@gmail.com
+ *
+ * Minor changes has been made by Liran Ben Gida
+ * LiranBG@gmail.com
+*/
+
+#include
+#include
+
+class Page
+{
+
+public:
+
+ ~Page() {}
+
+protected:
+ Page(std::string& html);
+ std::string getString();
+ std::string getTitle();
+ void makeText(std::string& html);
+
+
+private:
+
+
+ int findTitle(std::string& from, int index);
+ int runToActualText(std::string& from, int index);
+ void manageTableContent(std::string& html, int index);
+ int stitchText(std::string& from, std::string& to, int index);
+ bool endOfString(int index, int length);
+
+ std::string text;
+ std::string title;
+
+};
+
+#endif
diff --git a/src/jce/jceLoginHtmlScripts.h b/src/jce/jceLoginHtmlScripts.h
index 148a918..8700049 100644
--- a/src/jce/jceLoginHtmlScripts.h
+++ b/src/jce/jceLoginHtmlScripts.h
@@ -1,72 +1,72 @@
-#ifndef JCELOGINHTMLSCRIPTS_H
-#define JCELOGINHTMLSCRIPTS_H
-
-#include
-
-#define dst_host "yedion.jce.ac.il"
-#define dst_port 443
-
-#include "../user.h"
-
-class jceLoginHtmlScripts
-{
-
-private:
-
- jceLoginHtmlScripts();
-
-public:
-
- static std::string makeRequest(std::string parameters)
- {
- std::string msg;
- msg = "POST /yedion/fireflyweb.aspx HTTP/1.1\r\n";
- msg += "Host: " + std::string(dst_host) + "\r\n";
- msg += "Content-Type: application/x-www-form-urlencoded\r\n";
- msg += "Content-Length: " + to_string(parameters.length()) + "\r\n";
- msg += "Proxy-Connection: Keep-Alive\r\n";
- msg += "Accept-Charset: utf-8";
- msg += "Accept: text/plain\r\n";
- msg += "Connection: Keep-Alive\r\n";
- msg += "\r\n";
- msg += parameters;
- return msg;
- }
-
- const static std::string getFirstValidationStep(const user &usr)
- {
- std::string parameters = "?appname=BSHITA&prgname=LoginValidation&arguments=-N";
- parameters += usr.getUsername();
- parameters += ",-N";
- parameters += usr.getPassword();
- return parameters;
- }
-
- const static std::string getSecondValidationStep(const user &usr)
- {
- std::string parameters;
- parameters = "prgname=LoginValidtion1&Arguments=-N";
- parameters += usr.getUserID();
- parameters += ",-A,-N";
- parameters += usr.getHashedPassword();
- parameters += ",-A,-A";
- return parameters;
- }
- const static std::string getGradesPath(const user &usr)
- {
- std::string parameters;
- parameters = "PRGNAME=HADPASAT_MISMAHIM_LETALMID&ARGUMENTS=TZ,-N4,R1C2,R1C4,R1C1,R1C3,-A,-A,R1C5,-A,UNIQ&";
- parameters += "TZ=" + usr.getUserID() + "&";
- parameters += "UNIQ=" + usr.getHashedPassword() + "&";
- parameters += "R1C2=" + usr.date->getFYear() + "&";
- parameters += "R1C1=" + usr.date->getTYear() + "&";
- parameters += "R1C3=" + usr.date->getTSemester() + "&";
- parameters += "R1C4=" + usr.date->getFSemester() + "&";
- parameters += "R1C5=0";
- return parameters;
- }
-
-
-};
-
-#endif // JCELOGINHTMLSCRIPTS_H
+#ifndef JCELOGINHTMLSCRIPTS_H
+#define JCELOGINHTMLSCRIPTS_H
+
+#include
+
+#define dst_host "yedion.jce.ac.il"
+#define dst_port 443
+
+#include "../user.h"
+
+class jceLoginHtmlScripts
+{
+
+private:
+
+ jceLoginHtmlScripts();
+
+public:
+
+ static std::string makeRequest(std::string parameters)
+ {
+ std::string msg;
+ msg = "POST /yedion/fireflyweb.aspx HTTP/1.1\r\n";
+ msg += "Host: " + std::string(dst_host) + "\r\n";
+ msg += "Content-Type: application/x-www-form-urlencoded\r\n";
+ msg += "Content-Length: " + to_string(parameters.length()) + "\r\n";
+ msg += "Proxy-Connection: Keep-Alive\r\n";
+ msg += "Accept-Charset: utf-8";
+ msg += "Accept: text/plain\r\n";
+ msg += "Connection: Keep-Alive\r\n";
+ msg += "\r\n";
+ msg += parameters;
+ return msg;
+ }
+
+ const static std::string getFirstValidationStep(const user &usr)
+ {
+ std::string parameters = "?appname=BSHITA&prgname=LoginValidation&arguments=-N";
+ parameters += usr.getUsername();
+ parameters += ",-N";
+ parameters += usr.getPassword();
+ return parameters;
+ }
+
+ const static std::string getSecondValidationStep(const user &usr)
+ {
+ std::string parameters;
+ parameters = "prgname=LoginValidtion1&Arguments=-N";
+ parameters += usr.getUserID();
+ parameters += ",-A,-N";
+ parameters += usr.getHashedPassword();
+ parameters += ",-A,-A";
+ return parameters;
+ }
+ const static std::string getGradesPath(const user &usr)
+ {
+ std::string parameters;
+ parameters = "PRGNAME=HADPASAT_MISMAHIM_LETALMID&ARGUMENTS=TZ,-N4,R1C2,R1C4,R1C1,R1C3,-A,-A,R1C5,-A,UNIQ&";
+ parameters += "TZ=" + usr.getUserID() + "&";
+ parameters += "UNIQ=" + usr.getHashedPassword() + "&";
+ parameters += "R1C2=" + usr.date->getFYear() + "&";
+ parameters += "R1C1=" + usr.date->getTYear() + "&";
+ parameters += "R1C3=" + usr.date->getTSemester() + "&";
+ parameters += "R1C4=" + usr.date->getFSemester() + "&";
+ parameters += "R1C5=0";
+ return parameters;
+ }
+
+
+};
+
+#endif // JCELOGINHTMLSCRIPTS_H
diff --git a/src/jce/jcedate.cpp b/src/jce/jcedate.cpp
index 1638890..af59cc5 100644
--- a/src/jce/jcedate.cpp
+++ b/src/jce/jcedate.cpp
@@ -1,34 +1,34 @@
-#include "jcedate.h"
-
-jceDate::jceDate(std::string fromYear,std::string fromSemester,std::string toYear,std::string toSemester)
-{
- this->fSemester = fromSemester;
- this->fYear = fromYear;
- this->tSemester = toSemester;
- this->tYear = toYear;
-}
-
-void jceDate::setFYear(std::string fromYear)
-{
- this->fYear = fromYear;
-}
-
-void jceDate::setTYear(std::string toYear)
-{
- this->tYear = toYear;
-}
-
-void jceDate::setFSemester(std::string fromSemester)
-{
- this->fSemester = fromSemester;
-}
-
-void jceDate::setTSemester(std::string toSemester)
-{
- this->tSemester = toSemester;
-}
-
-jceDate::~jceDate()
-{
-
-}
+#include "jcedate.h"
+
+jceDate::jceDate(std::string fromYear,std::string fromSemester,std::string toYear,std::string toSemester)
+{
+ this->fSemester = fromSemester;
+ this->fYear = fromYear;
+ this->tSemester = toSemester;
+ this->tYear = toYear;
+}
+
+void jceDate::setFYear(std::string fromYear)
+{
+ this->fYear = fromYear;
+}
+
+void jceDate::setTYear(std::string toYear)
+{
+ this->tYear = toYear;
+}
+
+void jceDate::setFSemester(std::string fromSemester)
+{
+ this->fSemester = fromSemester;
+}
+
+void jceDate::setTSemester(std::string toSemester)
+{
+ this->tSemester = toSemester;
+}
+
+jceDate::~jceDate()
+{
+
+}
diff --git a/src/jce/jcedate.h b/src/jce/jcedate.h
index 46d965b..9a3fa55 100644
--- a/src/jce/jcedate.h
+++ b/src/jce/jcedate.h
@@ -1,33 +1,33 @@
-#ifndef JCEDATE_H
-#define JCEDATE_H
-
-#include
-
-class jceDate
-{
-
-public:
-
- jceDate(std::string fromYear, std::string fromSemester, std::string toYear, std::string toSemester);
- ~jceDate();
-
- void setFYear(std::string fromYear);
- void setTYear(std::string toYear);
- void setFSemester(std::string fromSemester);
- void setTSemester(std::string toSemester);
-
- std::string getFYear() { return this->fYear;}
- std::string getTYear() { return this->tYear;}
- std::string getFSemester() { return this->fSemester;}
- std::string getTSemester() { return this->tSemester;}
-
-private:
- std::string fYear; //from
- std::string fSemester;
-
- std::string tYear; //to
- std::string tSemester;
-
-};
-
-#endif // JCEDATE_H
+#ifndef JCEDATE_H
+#define JCEDATE_H
+
+#include
+
+class jceDate
+{
+
+public:
+
+ jceDate(std::string fromYear, std::string fromSemester, std::string toYear, std::string toSemester);
+ ~jceDate();
+
+ void setFYear(std::string fromYear);
+ void setTYear(std::string toYear);
+ void setFSemester(std::string fromSemester);
+ void setTSemester(std::string toSemester);
+
+ std::string getFYear() { return this->fYear;}
+ std::string getTYear() { return this->tYear;}
+ std::string getFSemester() { return this->fSemester;}
+ std::string getTSemester() { return this->tSemester;}
+
+private:
+ std::string fYear; //from
+ std::string fSemester;
+
+ std::string tYear; //to
+ std::string tSemester;
+
+};
+
+#endif // JCEDATE_H
diff --git a/src/jce/jcelogin.cpp b/src/jce/jcelogin.cpp
index dd559be..08eb1ae 100644
--- a/src/jce/jcelogin.cpp
+++ b/src/jce/jcelogin.cpp
@@ -1,187 +1,184 @@
-#include "jcelogin.h"
-
-jceLogin::jceLogin(user * username)
-{
- this->recieverPage = new std::string();
- this->jceA = username;
- this->JceConnector = new qtsslsocket(dst_host, dst_port);
-}
-
-jceLogin::~jceLogin()
-{
- this->jceA = NULL;
- delete recieverPage;
- delete JceConnector;
- JceConnector = NULL;
- recieverPage = NULL;
-}
-/**
- * @brief jceLogin::makeConnection Connecting to JCE student web site with JceA (username object) and validate it.
- * throws error upon the given error from JCE website or Socket error
- */
-void jceLogin::makeConnection() throw (jceStatus)
-{
- jceStatus status = jceStatus::JCE_NOT_CONNECTED;
-
- if (checkConnection() == true) //connected to host
- {
- if (makeFirstVisit() == true) //requst and send first validation
- {
- std::cout << "visit 1\n";
- std::cout << *(this->recieverPage);
- status = jceStatus::JCE_FIRST_VALIDATION_PASSED;
- if (checkValidation() == true) //check if username and password are matching
- {
- std::cout << "visit 2\n";
- std::cout << *(this->recieverPage);
- status = jceStatus::JCE_SECOND_VALIDATION_PASSED;
- if (makeSecondVisit() == true) //siging in the website
- {
- std::cout << "visit 3\n";
- std::cout << *(this->recieverPage);
- status = jceStatus::JCE_YOU_ARE_IN;
- setLoginFlag(true);
- }
- else
- status = jceStatus::ERROR_ON_VALIDATION;
- }
- else
- status = jceStatus::ERROR_ON_VALIDATION;
-
- }
- else
- status = jceStatus::ERROR_ON_VALIDATION_USER_BLOCKED;
-
- }
- else
- status = jceStatus::ERROR_ON_OPEN_SOCKET;
-
- //we throw status even if we are IN!
- throw status;
-
-}
-
-bool jceLogin::checkConnection()
-{
- if (JceConnector->isCon())
- return true;
-
- return false;
-}
-
-void jceLogin::reConnect() throw (jceStatus)
-{
- closeAll();
- this->recieverPage = new std::string();
- this->JceConnector = new qtsslsocket(dst_host, dst_port);
- try
- {
- makeConnection();
- }
- catch (jceLogin::jceStatus &a)
- {
- throw a;
- }
-}
-
-void jceLogin::closeAll()
-{
- delete recieverPage;
- recieverPage = NULL;
- JceConnector = NULL;
-
-}
-
-int jceLogin::makeFirstVisit()
-{
- std::string usr = jceA->getUsername();
- std::string psw = jceA->getPassword();
- if (JceConnector->send(jceLoginHtmlScripts::makeRequest(jceLoginHtmlScripts::getFirstValidationStep(*jceA))))
- {
- if (!JceConnector->recieve(*recieverPage))
- return jceLogin::ERROR_ON_GETTING_INFO;
- }
- else
- return jceLogin::ERROR_ON_SEND_REQUEST;
-
- return true;
-}
-
-int jceLogin::makeSecondVisit()
-{
- std::string usrid=jceA->getUserID();
- std::string pswid=jceA->getHashedPassword();
- if ((JceConnector->send(jceLoginHtmlScripts::makeRequest(jceLoginHtmlScripts::getSecondValidationStep(*jceA)))))
- {
- if (!(JceConnector->recieve(*recieverPage)))
- return jceLogin::ERROR_ON_GETTING_INFO;
-
- return true;
- }
- else
- return jceLogin::ERROR_ON_SEND_REQUEST;
-
- return true;
-}
-
-int jceLogin::getGrades()
-{
- if ((JceConnector->send(jceLoginHtmlScripts::makeRequest(jceLoginHtmlScripts::getGradesPath(*jceA)))))
- {
- if (!(JceConnector->recieve(*recieverPage)))
- return jceLogin::ERROR_ON_GETTING_GRADES;
-
- return true;
- }
- else
- return jceLogin::ERROR_ON_SEND_REQUEST;
-
- return true;
-
-}
-
-void jceLogin::setLoginFlag(bool x)
-{
- this->loginFlag = x;
-}
-bool jceLogin::isLoginFlag() const
-{
- return this->loginFlag;
-}
-
-std::string jceLogin::getPage()
-{
- return *recieverPage;
-}
-
-/**
- * @brief jceLogin::checkValidation Made by Nadav Luzzato
- * @return true if second validation step is right
- */
-bool jceLogin::checkValidation()
-{
- //finds the hashed password
- std::cout << *recieverPage << std::endl;
-
- std::size_t hasspass_position1 = recieverPage->find("-A,-N");
- hasspass_position1 += 5;
- std::size_t hasspass_position2 = recieverPage->find(",-A,-A", hasspass_position1);
- if ((hasspass_position2 != std::string::npos) && (hasspass_position1 != std::string::npos))
- {
- std::string hasspass = recieverPage->substr(hasspass_position1,hasspass_position2-hasspass_position1);
- jceA->setHashedPassword(hasspass);
- }
- //finds the user id
- std::size_t id_position1 = recieverPage->find("value=\"-N", 0);
- id_position1 += 9;
- std::size_t id_position2 = recieverPage->find(",-A", id_position1);
- if ((id_position2 != std::string::npos) && (id_position1 != std::string::npos))
- {
- std::string hassid = recieverPage->substr(id_position1,id_position2-id_position1);
- jceA->setUserID(hassid);
- }
- if (((jceA->getUserID()).empty()) || ((jceA->getHashedPassword()).empty()))
- return false;
-
- return true;
-}
+#include "jcelogin.h"
+
+jceLogin::jceLogin(user * username)
+{
+ this->recieverPage = new std::string();
+ this->jceA = username;
+ this->JceConnector = new qtsslsocket();
+}
+
+jceLogin::~jceLogin()
+{
+ this->jceA = NULL;
+ delete recieverPage;
+ delete JceConnector;
+ JceConnector = NULL;
+ recieverPage = NULL;
+}
+/**
+ * @brief jceLogin::makeConnection Connecting to JCE student web site with JceA (username object) and validate it.
+ * throws error upon the given error from JCE website or Socket error
+ */
+void jceLogin::makeConnection() throw (jceStatus)
+{
+ if (JceConnector->makeConnect(dst_host,dst_port) == false)
+ throw jceStatus::ERROR_ON_OPEN_SOCKET;
+
+ jceStatus status = jceStatus::JCE_NOT_CONNECTED;
+
+ if (checkConnection() == true) //connected to host
+ {
+ if (makeFirstVisit() == true) //requst and send first validation
+ {
+ status = jceStatus::JCE_FIRST_VALIDATION_PASSED;
+ if (checkValidation() == true) //check if username and password are matching
+ {
+ status = jceStatus::JCE_SECOND_VALIDATION_PASSED;
+ if (makeSecondVisit() == true) //siging in the website
+ {
+ status = jceStatus::JCE_YOU_ARE_IN;
+ setLoginFlag(true);
+ }
+ else
+ status = jceStatus::ERROR_ON_VALIDATION;
+ }
+ else
+ status = jceStatus::ERROR_ON_VALIDATION;
+
+ }
+ else
+ status = jceStatus::ERROR_ON_VALIDATION_USER_BLOCKED;
+
+ }
+ else
+ status = jceStatus::ERROR_ON_OPEN_SOCKET;
+
+ //we throw status even if we are IN!
+ throw status;
+
+}
+
+bool jceLogin::checkConnection()
+{
+ if (JceConnector->isCon())
+ return true;
+
+ return false;
+}
+
+void jceLogin::reConnect() throw (jceStatus)
+{
+ closeAll();
+ if (this->JceConnector != NULL)
+ delete JceConnector;
+ this->recieverPage = new std::string();
+ this->JceConnector = new qtsslsocket();
+ try
+ {
+ makeConnection();
+ }
+ catch (jceLogin::jceStatus &a)
+ {
+ throw a;
+ }
+}
+
+void jceLogin::closeAll()
+{
+ delete recieverPage;
+ recieverPage = NULL;
+ JceConnector = NULL;
+
+}
+
+int jceLogin::makeFirstVisit()
+{
+ std::string usr = jceA->getUsername();
+ std::string psw = jceA->getPassword();
+ if (JceConnector->send(jceLoginHtmlScripts::makeRequest(jceLoginHtmlScripts::getFirstValidationStep(*jceA))))
+ {
+ if (!JceConnector->recieve(*recieverPage))
+ return jceLogin::ERROR_ON_GETTING_INFO;
+ }
+ else
+ return jceLogin::ERROR_ON_SEND_REQUEST;
+
+ return true;
+}
+
+int jceLogin::makeSecondVisit()
+{
+ std::string usrid=jceA->getUserID();
+ std::string pswid=jceA->getHashedPassword();
+ if ((JceConnector->send(jceLoginHtmlScripts::makeRequest(jceLoginHtmlScripts::getSecondValidationStep(*jceA)))))
+ {
+ if (!(JceConnector->recieve(*recieverPage)))
+ return jceLogin::ERROR_ON_GETTING_INFO;
+
+ return true;
+ }
+ else
+ return jceLogin::ERROR_ON_SEND_REQUEST;
+
+ return true;
+}
+
+int jceLogin::getGrades()
+{
+ if ((JceConnector->send(jceLoginHtmlScripts::makeRequest(jceLoginHtmlScripts::getGradesPath(*jceA)))))
+ {
+ if (!(JceConnector->recieve(*recieverPage)))
+ return jceLogin::ERROR_ON_GETTING_GRADES;
+
+ return true;
+ }
+ else
+ return jceLogin::ERROR_ON_SEND_REQUEST;
+
+ return true;
+
+}
+
+void jceLogin::setLoginFlag(bool x)
+{
+ this->loginFlag = x;
+}
+bool jceLogin::isLoginFlag() const
+{
+ return this->loginFlag;
+}
+
+std::string jceLogin::getPage()
+{
+ return *recieverPage;
+}
+
+/**
+ * @brief jceLogin::checkValidation Made by Nadav Luzzato
+ * @return true if second validation step is right
+ */
+bool jceLogin::checkValidation()
+{
+ //finds the hashed password
+ std::size_t hasspass_position1 = recieverPage->find("-A,-N");
+ hasspass_position1 += 5;
+ std::size_t hasspass_position2 = recieverPage->find(",-A,-A", hasspass_position1);
+ if ((hasspass_position2 != std::string::npos) && (hasspass_position1 != std::string::npos))
+ {
+ std::string hasspass = recieverPage->substr(hasspass_position1,hasspass_position2-hasspass_position1);
+ jceA->setHashedPassword(hasspass);
+ }
+ //finds the user id
+ std::size_t id_position1 = recieverPage->find("value=\"-N", 0);
+ id_position1 += 9;
+ std::size_t id_position2 = recieverPage->find(",-A", id_position1);
+ if ((id_position2 != std::string::npos) && (id_position1 != std::string::npos))
+ {
+ std::string hassid = recieverPage->substr(id_position1,id_position2-id_position1);
+ jceA->setUserID(hassid);
+ }
+ if (((jceA->getUserID()).empty()) || ((jceA->getHashedPassword()).empty()))
+ return false;
+
+ return true;
+}
diff --git a/src/jce/jcelogin.h b/src/jce/jcelogin.h
index 8d804a8..f9a9638 100644
--- a/src/jce/jcelogin.h
+++ b/src/jce/jcelogin.h
@@ -1,61 +1,61 @@
-#ifndef JCELOGIN_H
-#define JCELOGIN_H
-
-#include
-#include
-
-#include "../connection/qtsslsocket.h"
-#include "../user.h"
-#include "jceLoginHtmlScripts.h"
-
-
-
-
-class jceLogin
-{
-public:
-
- enum jceStatus {
- JCE_NOT_CONNECTED,
- ERROR_ON_VALIDATION,
- ERROR_ON_VALIDATION_USER_BLOCKED,
- ERROR_ON_INPUT,
- ERROR_ON_CONNECTING,
- ERROR_ON_OPEN_SOCKET,
- ERROR_ON_GETTING_INFO,
- ERROR_ON_GETTING_GRADES,
- ERROR_ON_SEND_REQUEST,
- JCE_START_VALIDATING_PROGRESS,
- JCE_FIRST_VALIDATION_PASSED,
- JCE_SECOND_VALIDATION_PASSED,
- JCE_YOU_ARE_IN,
- JCE_GRADE_PAGE_PASSED
- };
-
- jceLogin(user* username);
- ~jceLogin();
- void makeConnection() throw (jceStatus);
- bool checkConnection();
- void reConnect() throw (jceStatus);
- void closeAll();
- int getGrades();
- bool isLoginFlag() const;
-
- std::string getPage();
-
-
-
-private:
- int makeFirstVisit();
- bool checkValidation();
- int makeSecondVisit();
- void setLoginFlag(bool x);
-
- bool loginFlag;
- std::string * recieverPage;
- user * jceA;
- qtsslsocket * JceConnector;
-
-};
-
-#endif // JCELOGIN_H
+#ifndef JCELOGIN_H
+#define JCELOGIN_H
+
+#include
+#include
+
+#include "../connection/qtsslsocket.h"
+#include "../user.h"
+#include "jceLoginHtmlScripts.h"
+
+
+
+
+class jceLogin
+{
+public:
+
+ enum jceStatus {
+ JCE_NOT_CONNECTED,
+ ERROR_ON_VALIDATION,
+ ERROR_ON_VALIDATION_USER_BLOCKED,
+ ERROR_ON_INPUT,
+ ERROR_ON_CONNECTING,
+ ERROR_ON_OPEN_SOCKET,
+ ERROR_ON_GETTING_INFO,
+ ERROR_ON_GETTING_GRADES,
+ ERROR_ON_SEND_REQUEST,
+ JCE_START_VALIDATING_PROGRESS,
+ JCE_FIRST_VALIDATION_PASSED,
+ JCE_SECOND_VALIDATION_PASSED,
+ JCE_YOU_ARE_IN,
+ JCE_GRADE_PAGE_PASSED
+ };
+
+ jceLogin(user* username);
+ ~jceLogin();
+ void makeConnection() throw (jceStatus);
+ bool checkConnection();
+ void reConnect() throw (jceStatus);
+ void closeAll();
+ int getGrades();
+ bool isLoginFlag() const;
+
+ std::string getPage();
+
+
+
+private:
+ int makeFirstVisit();
+ bool checkValidation();
+ int makeSecondVisit();
+ void setLoginFlag(bool x);
+
+ bool loginFlag;
+ std::string * recieverPage;
+ user * jceA;
+ qtsslsocket * JceConnector;
+
+};
+
+#endif // JCELOGIN_H
diff --git a/src/user.cpp b/src/user.cpp
index 5bb944a..934a9c3 100644
--- a/src/user.cpp
+++ b/src/user.cpp
@@ -1,52 +1,52 @@
-#include "user.h"
-
-
-user::user(string username,string password) : hashedPassword(""),userID(""), influenceCourseOnly(false)
-{
-
- this->username = username;
- this->password = password;
-}
-user::~user()
-{
- delete date;
-}
-void user::setDate(std::string fromYear, std::string fromSemester, std::string toYear, std::string toSemester)
-{
- date->setFYear(fromYear);
- date->setFSemester(fromSemester);
- date->setTYear(toYear);
- date->setTSemester(toSemester);
-}
-
-void user::setInfluenceCourseOnly(bool status)
-{
- this->influenceCourseOnly = status;
-}
-
-bool user::getInfluenceCourseOnly() const
-{
- return this->influenceCourseOnly;
-}
-
-void user::setUsername(string& username) {
- this->username=username;
-}
-
-void user::setPassword(string& password) {
- this->password=password;
-}
-
-void user::setUserID(string& ID)
-{
- this->userID = ID;
-}
-void user::setHashedPassword(string& hashpass)
-{
- this->hashedPassword = hashpass;
-}
-
-string user::getPassword() const { return password; }
-string user::getUsername() const { return username; }
-string user::getUserID() const { return userID; }
-string user::getHashedPassword() const { return hashedPassword; }
+#include "user.h"
+
+
+user::user(string username,string password) : hashedPassword(""),userID(""), influenceCourseOnly(false)
+{
+
+ this->username = username;
+ this->password = password;
+}
+user::~user()
+{
+ delete date;
+}
+void user::setDate(std::string fromYear, std::string fromSemester, std::string toYear, std::string toSemester)
+{
+ date->setFYear(fromYear);
+ date->setFSemester(fromSemester);
+ date->setTYear(toYear);
+ date->setTSemester(toSemester);
+}
+
+void user::setInfluenceCourseOnly(bool status)
+{
+ this->influenceCourseOnly = status;
+}
+
+bool user::getInfluenceCourseOnly() const
+{
+ return this->influenceCourseOnly;
+}
+
+void user::setUsername(string& username) {
+ this->username=username;
+}
+
+void user::setPassword(string& password) {
+ this->password=password;
+}
+
+void user::setUserID(string& ID)
+{
+ this->userID = ID;
+}
+void user::setHashedPassword(string& hashpass)
+{
+ this->hashedPassword = hashpass;
+}
+
+string user::getPassword() const { return password; }
+string user::getUsername() const { return username; }
+string user::getUserID() const { return userID; }
+string user::getHashedPassword() const { return hashedPassword; }
diff --git a/src/user.h b/src/user.h
index 4eaeecd..8895024 100644
--- a/src/user.h
+++ b/src/user.h
@@ -1,48 +1,48 @@
-#ifndef user_H
-#define user_H
-
-#include
-#include
-#include "jce/jcedate.h"
-
-using namespace std;
-class user
-{
-public:
- user(string username,string password);
- ~user();
- void setUsername(string& username);
- void setPassword(string& password);
-
- string getPassword() const;
- string getUsername() const;
-
- void setUserID(string& ID);
- void setHashedPassword(string& hashpass);
-
- string getUserID() const;
- string getHashedPassword() const;
-
- void setDate(std::string fromYear, std::string fromSemester, std::string toYear, std::string toSemester);
-
- void setInfluenceCourseOnly(bool status);
- bool getInfluenceCourseOnly() const;
-
- jceDate * const date = new jceDate("","","",""); //we do not change the pointer
-
-private:
-
- string username;
- string password;
-
- string hashedPassword;
- string userID;
-
- bool influenceCourseOnly;
-
-
-
-};
-#endif
-
-
+#ifndef user_H
+#define user_H
+
+#include
+#include
+#include "jce/jcedate.h"
+
+using namespace std;
+class user
+{
+public:
+ user(string username,string password);
+ ~user();
+ void setUsername(string& username);
+ void setPassword(string& password);
+
+ string getPassword() const;
+ string getUsername() const;
+
+ void setUserID(string& ID);
+ void setHashedPassword(string& hashpass);
+
+ string getUserID() const;
+ string getHashedPassword() const;
+
+ void setDate(std::string fromYear, std::string fromSemester, std::string toYear, std::string toSemester);
+
+ void setInfluenceCourseOnly(bool status);
+ bool getInfluenceCourseOnly() const;
+
+ jceDate * const date = new jceDate("","","",""); //we do not change the pointer
+
+private:
+
+ string username;
+ string password;
+
+ string hashedPassword;
+ string userID;
+
+ bool influenceCourseOnly;
+
+
+
+};
+#endif
+
+
| |